tools: fix x11 check

X.org is installed in /usr/X11R7.
Attached patch covers this in the x11 check.
Xen has no direct X11 dependency
(it's inherited from SDL and SDL is optional for qemu-dm)
so warn but don't fail if no X11 is installed.
Fixes build problem on distributions which build their packages (*BSD
and Gentoo).

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

diff --git a/tools/check/check_x11_devel b/tools/check/check_x11_devel
index aab7e42cda357728ef0bc48eeecc922cc7f332e1..8b7df98400b778f2549da919701e0e20d760fefb 100755 (executable)
--- a/tools/check/check_x11_devel
+++ b/tools/check/check_x11_devel
@@ -5,4 +5,5 @@
 
 has_header X11/keysymdef.h || \
 has_header /usr/X11R6/include/X11/keysymdef.h || \
-fail "can't find X11 headers"
+has_header /usr/X11R7/include/X11/keysymdef.h || \
+warning "can't find X11 headers"

diff --git a/tools/check/funcs.sh b/tools/check/funcs.sh
index d3fb60abb30eca82886b34e66f3faa892e5d3c93..095dcb1ad23471de599108f969e29e773930b461 100644 (file)
--- a/tools/check/funcs.sh
+++ b/tools/check/funcs.sh
@@ -78,6 +78,11 @@ check_sys_root() {
        fi
 }
 
+warning() {
+       echo
+       echo " *** `basename "$0"` FAILED${*+: $*}"
+}
+
 fail() {
        echo
        echo " *** `basename "$0"` FAILED${*+: $*}"